Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LSBBA / Migrate batch auctions code to benefit from atomic auction changes #23

Merged
merged 88 commits into from
Jan 23, 2024
Merged

LSBBA / Migrate batch auctions code to benefit from atomic auction changes #23

merged 88 commits into from
Jan 23, 2024

Conversation

0xJem
Copy link
Contributor

@0xJem 0xJem commented Jan 18, 2024 •
edited
Loading

#21 should be merged to master first

0xJem added 30 commits January 11, 2024 13:25
@0xJem
Documentation
15d1c5b
@0xJem
Merge branch 'jem/auction-management' into jem/atomic-auctions
429b08d
@0xJem
Document purchase()
b3805d0
@0xJem
Modifier for valid lot
7d56dff
@0xJem
Use modifier
d91ad15
@0xJem
WIP tests for atomic purchase
e2cb3ba
@0xJem
Shift parameters to purchase() into struct. WIP tests.
eaf5ec7
@0xJem
Comments
f30d5ac
@0xJem
forge install: permit2
b2aadc0
@0xJem
Remove permit2 library. Add basic interface and clone.
d1687db
@0xJem
Documentation TODOs
360552f
@0xJem
Refactor test TODOs for purchase using branching technique
6fc997c
@0xJem
TODOs
f2e07be
@0xJem
Merge branch 'master' into jem/atomic-auctions
689fd43 
# Conflicts:
#	src/AuctionHouse.sol
@0xJem
Compile fix
9c58c0f
@0xJem
Use solhint-community
216e063
@0xJem
Add new solhint rules
e7abe1d
@0xJem
Disable solhint rule
6f0b598
@0xJem
chore: linting fixes
b909d7f
@0xJem
WIP refactoring of payment collection into Router
3a6e6a1
@0xJem
transfer and pre-hook implementation
469fc21
@0xJem
Tests and implementation for Permit2 transfers
d3a5294
@0xJem
Documentation
db34c90
@0xJem
Fix cancelled test
19a2541
@0xJem
Fix test function names
5f5ba74
@0xJem
Simplify Permit2 signing. Add tests for allowlist.
777b78b
@0xJem
WIP tests for _collectPayout
601180a
@0xJem
More test TODOs. Implement _collectPayout().
30f757d
@0xJem
Cleanup
9cd7ec1
@0xJem
sendPayment()
32e6cb7
Oighty and others added 20 commits January 20, 2024 16:40
@Oighty
feat: add priority queue implementation to LSSBA
4b97dcb
@Oighty
feat: add settlement function to LSBBA
eb9c1ae
@Oighty
feat: add auction, cancelAuction, and claimRefund functions to LSBBA
55acd28
@0xJem
Notes
5fb4ca4
@0xJem
transferFrom
f6a0583
@0xJem
Add underlying token to deploy/mint functions. Correct implementation…
7b1b42d 
… of MockDerivativeModule.
@0xJem
Merge branch 'jem/batch-auctions' of github.com:Bond-Protocol/moonrak…
c7c6911 
…er into jem/batch-auctions
@0xJem
chore: linting
89e47c2
@0xJem
Complete migration of lotId to uint96. Fix compilation errors.
8ff6fc7
@0xJem
Fix stack too deep error
114334a
@0xJem
Rename test file
681be7b
@0xJem
Revert "Rename test file"
5651472 
This reverts commit 681be7b.
@0xJem
Tests for bid()
214a6f5
@0xJem
Adjust type for auctionParam
9df2923
@0xJem
Documentation
bbb1f80
@0xJem
Document behaviour
11803e3
@0xJem
Add stub for claimRefund(). Consistent type for bidId.
da6dbe6
@0xJem
Test for cancelBid()
09e0e24
@Oighty
docs: design updates
629a146
@Oighty
docs: more design updates for LSBBA
ffa9e0d
@Oighty Oighty mentioned this pull request Jan 22, 2024
Closed
12 tasks
@0xJem 0xJem changed the title [DRAFT] Migrate batch auctions code to benefit from atomic auction changes LBSSA / Migrate batch auctions code to benefit from atomic auction changes Jan 23, 2024
@0xJem 0xJem changed the title LBSSA / Migrate batch auctions code to benefit from atomic auction changes LSBBA / Migrate batch auctions code to benefit from atomic auction changes Jan 23, 2024
@0xJem
Copy link
Contributor Author

0xJem commented Jan 23, 2024

Merging so we minimise the active branches

@0xJem 0xJem merged commit 97808e0 into batch-auctions Jan 23, 2024
1 check failed
@0xJem 0xJem deleted the jem/batch-auctions branch January 23, 2024 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@0xJem 0xJem

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@0xJem @Oighty